Merge stage-aosp-master into pi-dev-plus-aosp Bug: 126125118 Change-Id: I467dd0718678cb348d4fd8dbb56f3e164a6c44b0